From: Keir Fraser <keir@xen.org>
Date: Sat, 2 Jul 2011 08:08:27 +0000 (+0100)
Subject: x86: Remove redundant cpuid-faulting-related BUG_ON I added.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~10075
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=d22d26c1a70e3891745c794ca5b7669f1277baa7;p=xen.git

x86: Remove redundant cpuid-faulting-related BUG_ON I added.

Signed-off-by: Keir Fraser <keir@xen.org>
---

diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c
index e99e973838..3eb06b3d8f 100644
--- a/xen/arch/x86/cpu/intel.c
+++ b/xen/arch/x86/cpu/intel.c
@@ -229,9 +229,6 @@ static void __devinit init_intel(struct cpuinfo_x86 *c)
 	if (!cpu_has_cpuid_faulting)
 		set_cpuidmask(c);
 
-	BUG_ON(cpu_has(c, X86_FEATURE_CPUID_FAULTING) !=
-	       boot_cpu_has(X86_FEATURE_CPUID_FAULTING));
-
 	/* Work around errata */
 	Intel_errata_workarounds(c);